projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61cf880 80d936c)
bitkeeper revision 1.1159.1.499 (41c98e4dmK1aL0WxfC5e06SAvZye5A)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 15:10:05 +0000 (15:10 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 22 Dec 2004 15:10:05 +0000 (15:10 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/domain.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/domain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.